From: Keir Fraser Date: Mon, 26 May 2008 07:26:37 +0000 (+0100) Subject: Fix XendAPI VM_migrate parameters X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14207^2~34 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=11b6a5dbe0eb69da943cb1709270d3bf71c2aa75;p=xen.git Fix XendAPI VM_migrate parameters This patch removes unused resource parameter and fixes the default value for domain_migrate. Also removes tab indent in XendOptions.py. Signed-off-by: Zhigang Wang --- diff --git a/tools/python/xen/xend/XendAPI.py b/tools/python/xen/xend/XendAPI.py index ec527ef104..b357b07d09 100644 --- a/tools/python/xen/xend/XendAPI.py +++ b/tools/python/xen/xend/XendAPI.py @@ -1759,13 +1759,12 @@ class XendAPI(object): xendom = XendDomain.instance() xeninfo = xendom.get_vm_by_uuid(vm_ref) - resource = other_config.get("resource", 0) port = other_config.get("port", 0) - node = other_config.get("node", 0) - ssl = other_config.get("ssl", 0) + node = other_config.get("node", -1) + ssl = other_config.get("ssl", None) xendom.domain_migrate(xeninfo.getDomid(), destination_url, - bool(live), resource, port, node, ssl) + bool(live), port, node, ssl) return xen_api_success_void() def VM_save(self, _, vm_ref, dest, checkpoint): diff --git a/tools/python/xen/xend/XendOptions.py b/tools/python/xen/xend/XendOptions.py index da8504b4a5..95d3751644 100644 --- a/tools/python/xen/xend/XendOptions.py +++ b/tools/python/xen/xend/XendOptions.py @@ -222,7 +222,7 @@ class XendOptions: self.xend_relocation_port_default) def get_xend_relocation_ssl_port(self): - """Get the port xend listens at for ssl connection to its relocation + """Get the port xend listens at for ssl connection to its relocation server. """ return self.get_config_int('xend-relocation-ssl-port',